Merge with upstream and update Cargo.lock
authorСухарик <suhr@i2pmail.org>
Thu, 4 Sep 2014 09:37:09 +0000 (13:37 +0400)
committerСухарик <suhr@i2pmail.org>
Thu, 4 Sep 2014 09:37:09 +0000 (13:37 +0400)
commitcc9ed63222b4a9e3bb58bffb8f039427bbe61827
tree199bdfc3578ca0634f5637c919452c7c70e77d89
parenta13fddc9d1bf5a131b85834d8c75a25bbacd663f
parentfd7a83a6f678a9aacd14d92036373d3381cb8812
Merge with upstream and update Cargo.lock

Conflicts:
src/bin/new.rs
src/cargo/ops/cargo_new.rs
Cargo.lock
src/bin/new.rs
src/cargo/ops/cargo_new.rs
tests/test_cargo_new.rs